From 422d4ae9e6beca0d817ec2a779963c1279f266a1 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Tue, 16 Feb 2021 00:12:33 +0000
Subject: [PATCH] d/rules: Don't export build results for tests that upstream
 expect to fail

---
 debian/rules | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/debian/rules b/debian/rules
index 9ebe81891f..1a602e970a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -202,6 +202,11 @@ fuzzy_reftests = \
 	quit-mnemonic \
 	$(NULL)
 
+xfail_reftests = \
+	label-sizing \
+	sizegroups-evolution-identity-page \
+	$(NULL)
+
 # TODO: Known failures:
 # amd64: none
 # arm64: none
@@ -261,7 +266,15 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 		--timeout-multiplier $(test_timeout_multiplier) \
 	|| touch debian/tests-failed
 	tail -v -n +0 debian/build/deb/meson-logs/testlog-x11.txt
+	# Don't base64-encode the image results for tests that upstream
+	# expect to fail
+	set -e; for reftest in $(xfail_reftests); do \
+		rm -f debian/build/deb/testsuite/reftests/output/x11/$$reftest.diff.png; \
+	done
+	# Put the rest in the log as base64 since we don't have an
+	# equivalent of AUTOPKGTEST_ARTIFACTS for buildds
 	debian/log-reftests.py
+	# Avoid incremental builds with -nc leaking settings into the next build
 	set -e; for reftest in $(fuzzy_reftests); do \
 		rm -f testsuite/reftests/$$reftest.keyfile; \
 	done
-- 
2.30.2